added note about the inablity to do height-for-width text layout and

2006-05-02  Michael Natterer  <mitch@imendio.com>

	* gtk/gtklabel.c (gtk_label_set_line_wrap): added note about the
	inablity to do height-for-width text layout and suggest to use
	gtk_widget_set_size_request() for getting a label that wraps at
	some specific position.

diff --git a/ChangeLog b/ChangeLog
index 7594c1abbf847834dd8abc6f1275604e11f88a0c..e230ff92041a6c207fc0d036b1bd0a504d09466a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-02  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtklabel.c (gtk_label_set_line_wrap): added note about the
+       inablity to do height-for-width text layout and suggest to use
+       gtk_widget_set_size_request() for getting a label that wraps at
+       some specific position.
+
 2006-05-02  Kristian Rietveld  <kris@imendio.com>
 
        * ChangeLog.gtk-async-file-chooser: added ChangeLog entries from

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7594c1abbf847834dd8abc6f1275604e11f88a0c..e230ff92041a6c207fc0d036b1bd0a504d09466a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2006-05-02  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtklabel.c (gtk_label_set_line_wrap): added note about the
+       inablity to do height-for-width text layout and suggest to use
+       gtk_widget_set_size_request() for getting a label that wraps at
+       some specific position.
+
 2006-05-02  Kristian Rietveld  <kris@imendio.com>
 
        * ChangeLog.gtk-async-file-chooser: added ChangeLog entries from

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 28ea816c05f2a590deec04c86db54e83af0de32c..de02fee511659064deef2799c1a553a173afe156 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1683,6 +1683,12 @@ gtk_label_get_max_width_chars (GtkLabel *label)
  * Toggles line wrapping within the #GtkLabel widget.  %TRUE makes it break
  * lines if text exceeds the widget's size.  %FALSE lets the text get cut off
  * by the edge of the widget if it exceeds the widget size.
+ *
+ * Note that setting line wrapping to %TRUE does not make the label
+ * wrap at its parent container's width, because GTK+ widgets
+ * conceptually can't make their requisition depend on the parent
+ * container's size. For a label that wraps at a specific position,
+ * set the label's width using gtk_widget_set_size_request().
  **/
 void
 gtk_label_set_line_wrap (GtkLabel *label,